From 030a52f13b24af32b625be492ed94bbeddd9450b Mon Sep 17 00:00:00 2001 From: Robert Lipe Date: Wed, 16 Mar 2022 21:11:09 -0500 Subject: [PATCH] Remove googledir, geonet --- CMakeLists.txt | 1 - GPSBabel.pro | 1 - googledir.cc => deprecated/googledir.cc | 0 gpsbabel.qrc | 1 - reference/format0.txt | 2 - reference/format1.txt | 2 - reference/format2.txt | 2 - reference/format3.txt | 18 -------- reference/geonet-sample.gpx | 55 ------------------------- reference/geonet-sample.txt | 10 ----- reference/help.txt | 9 ---- style/geonet.style | 49 ---------------------- testo.d/googledir.test | 6 --- vecs.cc | 9 ---- xmldoc/formats/geonet.xml | 1 - xmldoc/formats/googledir.xml | 21 ---------- 16 files changed, 187 deletions(-) rename googledir.cc => deprecated/googledir.cc (100%) delete mode 100644 reference/geonet-sample.gpx delete mode 100644 reference/geonet-sample.txt delete mode 100644 style/geonet.style delete mode 100644 testo.d/googledir.test delete mode 100644 xmldoc/formats/geonet.xml delete mode 100644 xmldoc/formats/googledir.xml diff --git a/CMakeLists.txt b/CMakeLists.txt index 2ced30ede..0dd9ac25e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -101,7 +101,6 @@ set(ALL_FMTS ${MINIMAL_FMTS} ggv_bin.cc ggv_ovl.cc globalsat_sport.cc - googledir.cc gpssim.cc gtm.cc gtrnctr.cc diff --git a/GPSBabel.pro b/GPSBabel.pro index ff32011c4..a8b50b881 100644 --- a/GPSBabel.pro +++ b/GPSBabel.pro @@ -76,7 +76,6 @@ ALL_FMTS = $$MINIMAL_FMTS \ ggv_bin.cc \ ggv_ovl.cc \ globalsat_sport.cc \ - googledir.cc \ gpssim.cc \ gtm.cc \ gtrnctr.cc \ diff --git a/googledir.cc b/deprecated/googledir.cc similarity index 100% rename from googledir.cc rename to deprecated/googledir.cc diff --git a/gpsbabel.qrc b/gpsbabel.qrc index 35a5fe76b..40b9d3c19 100644 --- a/gpsbabel.qrc +++ b/gpsbabel.qrc @@ -11,7 +11,6 @@ style/garmin301.style style/garmin_g1000.style style/garmin_poi.style - style/geonet.style style/gpsdrive.style style/gpsdrivetrack.style style/iblue747.style diff --git a/reference/format0.txt b/reference/format0.txt index c34427103..fae83b987 100644 --- a/reference/format0.txt +++ b/reference/format0.txt @@ -31,11 +31,9 @@ garmin Garmin serial/USB protocol gtrnctr tcx/crs/hst/xml Garmin Training Center (.tcx/.crs/.hst/.xml) geo loc Geocaching.com .loc geojson json GeoJson -geonet txt GEOnet Names Server (GNS) dg-100 GlobalSat DG-100/BT-335 Download dg-200 GlobalSat DG-200 Download globalsat GlobalSat GH625XT GPS training watch -googledir xml Google Directions XML kml kml Google Earth (Keyhole) Markup Language land_air_sea txt GPS Tracking Key Pro text gtm gtm GPS TrackMaker diff --git a/reference/format1.txt b/reference/format1.txt index 9827f22fa..ff6656db5 100644 --- a/reference/format1.txt +++ b/reference/format1.txt @@ -34,13 +34,11 @@ serial garmin Garmin serial/USB protocol file gtrnctr tcx/crs/hst/xml Garmin Training Center (.tcx/.crs/.hst/.xml) file geo loc Geocaching.com .loc file geojson json GeoJson -file geonet txt GEOnet Names Server (GNS) internal dg-100-bin GlobalSat DG-100/BT-335 Binary File serial dg-100 GlobalSat DG-100/BT-335 Download internal dg-200-bin GlobalSat DG-200 Binary File serial dg-200 GlobalSat DG-200 Download serial globalsat GlobalSat GH625XT GPS training watch -file googledir xml Google Directions XML file kml kml Google Earth (Keyhole) Markup Language file land_air_sea txt GPS Tracking Key Pro text file gtm gtm GPS TrackMaker diff --git a/reference/format2.txt b/reference/format2.txt index ca952871b..a25a64392 100644 --- a/reference/format2.txt +++ b/reference/format2.txt @@ -34,13 +34,11 @@ serial rwrwrw garmin Garmin serial/USB protocol file r-rw-- gtrnctr tcx/crs/hst/xml Garmin Training Center (.tcx/.crs/.hst/.xml) file rw---- geo loc Geocaching.com .loc file rwrwrw geojson json GeoJson -file rw---- geonet txt GEOnet Names Server (GNS) internal r-r--- dg-100-bin GlobalSat DG-100/BT-335 Binary File serial r-r--- dg-100 GlobalSat DG-100/BT-335 Download internal r-r--- dg-200-bin GlobalSat DG-200 Binary File serial r-r--- dg-200 GlobalSat DG-200 Download serial --r--- globalsat GlobalSat GH625XT GPS training watch -file --r--- googledir xml Google Directions XML file rwrwrw kml kml Google Earth (Keyhole) Markup Language file --rw-- land_air_sea txt GPS Tracking Key Pro text file rwrwrw gtm gtm GPS TrackMaker diff --git a/reference/format3.txt b/reference/format3.txt index 00c83f56b..e20fed34a 100644 --- a/reference/format3.txt +++ b/reference/format3.txt @@ -374,22 +374,6 @@ file rwrwrw geojson json GeoJson geojson https://www.gpsbabel.org/WEB_DOC_DIR/fmt_geojson.html option geojson compact Compact Output. Default is off. boolean https://www.gpsbabel.org/WEB_DOC_DIR/fmt_geojson.html#fmt_geojson_o_compact -file rw---- geonet txt GEOnet Names Server (GNS) xcsv - https://www.gpsbabel.org/WEB_DOC_DIR/fmt_geonet.html -option geonet snlen Max synthesized shortname length integer 1 https://www.gpsbabel.org/WEB_DOC_DIR/fmt_geonet.html#fmt_geonet_o_snlen - -option geonet snwhite Allow whitespace synth. shortnames boolean https://www.gpsbabel.org/WEB_DOC_DIR/fmt_geonet.html#fmt_geonet_o_snwhite - -option geonet snupper UPPERCASE synth. shortnames boolean https://www.gpsbabel.org/WEB_DOC_DIR/fmt_geonet.html#fmt_geonet_o_snupper - -option geonet snunique Make synth. shortnames unique boolean https://www.gpsbabel.org/WEB_DOC_DIR/fmt_geonet.html#fmt_geonet_o_snunique - -option geonet urlbase Basename prepended to URL on output string https://www.gpsbabel.org/WEB_DOC_DIR/fmt_geonet.html#fmt_geonet_o_urlbase - -option geonet prefer_shortnames Use shortname instead of description boolean https://www.gpsbabel.org/WEB_DOC_DIR/fmt_geonet.html#fmt_geonet_o_prefer_shortnames - -option geonet datum GPS datum (def. WGS 84) string https://www.gpsbabel.org/WEB_DOC_DIR/fmt_geonet.html#fmt_geonet_o_datum - internal r-r--- dg-100-bin GlobalSat DG-100/BT-335 Binary File dg-100-bin https://www.gpsbabel.org/WEB_DOC_DIR/fmt_dg-100-bin.html option dg-100-bin erase Erase device data after download boolean 0 https://www.gpsbabel.org/WEB_DOC_DIR/fmt_dg-100-bin.html#fmt_dg-100-bin_o_erase @@ -426,8 +410,6 @@ option globalsat input-is-dump-file Dump raw data to this file boolean https: option globalsat timezone Time zone ID string https://www.gpsbabel.org/WEB_DOC_DIR/fmt_globalsat.html#fmt_globalsat_o_timezone -file --r--- googledir xml Google Directions XML googledir - https://www.gpsbabel.org/WEB_DOC_DIR/fmt_googledir.html file rwrwrw kml kml Google Earth (Keyhole) Markup Language kml https://www.gpsbabel.org/WEB_DOC_DIR/fmt_kml.html option kml deficon Default icon name string https://www.gpsbabel.org/WEB_DOC_DIR/fmt_kml.html#fmt_kml_o_deficon diff --git a/reference/geonet-sample.gpx b/reference/geonet-sample.gpx deleted file mode 100644 index e2159b6c3..000000000 --- a/reference/geonet-sample.gpx +++ /dev/null @@ -1,55 +0,0 @@ - - - - - - PLAUEN - Plauen - Plauen - - - PLAUEN - Plauen - Plauen - - - PLAUEN STADTKREIS - Stadtkreis Plauen - Stadtkreis Plauen - - - PLAUENERSTADTWALD - Plauener Stadtwald - Plauener Stadtwald - - - ZSCHOPAU - Zschopau - Zschopau - - - ZSCHOPAU - Zschopau - Zschopau - - - ZSCHOPEL - Zschöpel - Zschöpel - - - ZSCHOPENBERG - Zschopen-Berg - Zschopen-Berg - - - ZSCHOPENTHAL - Zschopenthal - Zschopenthal - - diff --git a/reference/geonet-sample.txt b/reference/geonet-sample.txt deleted file mode 100644 index d6c89798e..000000000 --- a/reference/geonet-sample.txt +++ /dev/null @@ -1,10 +0,0 @@ -RC UFI UNI LAT LONG DMS_LAT DMS_LONG UTM JOG FC DSG PC CC1 ADM1 ADM2 DIM CC2 NT LC SHORT_FORM GENERIC SORT_NAME FULL_NAME FULL_NAME_ND MODIFY_DATE -1 -1843626 -2549662 51.0166667 13.7166667 510100 134300 VS05 NM33-01 P PPLX GM 13 N PLAUEN Plauen Plauen 1994-01-08 -1 -1843625 -2549661 50.5 12.1333333 503000 120800 TR99 NM33-04 P PPL 3 GM 13 N PLAUEN Plauen Plauen 2002-05-02 -1 -1843628 -2549664 50.5 12.1333333 503000 120800 TR99 NM33-04 A ADM3 GM 13 Chemnitz V PLAUEN STADTKREIS Stadtkreis Plauen Stadtkreis Plauen 1998-04-28 -1 -1843629 -2549666 50.5333333 12.1333333 503200 120800 TS90 NM33-04 V FRST GM 13 N PLAUENERSTADTWALD Plauener Stadtwald Plauener Stadtwald 1998-05-12 -1 -1893314 -2603706 51.1333333 13.05 510800 130300 US66 NM33-01 H STM GM 13 N ZSCHOPAU Zschopau Zschopau 1994-01-08 -1 -1893313 -2603705 50.75 13.0666667 504500 130400 US62 NM33-04 P PPL 4 GM 13 N ZSCHOPAU Zschopau Zschopau 2002-05-02 -1 -1893316 -2603708 50.8666667 12.4166667 505200 122500 US13 NM33-04 P PPL GM 15 N ZSCHOPEL Zschöpel Zschopel 1998-05-15 -1 -1893317 -2603709 50.7333333 13.0666667 504400 130400 US62 NM33-04 T HLL GM 13 N ZSCHOPENBERG Zschopen-Berg Zschopen-Berg 1994-01-08 -1 -1893318 -2603710 50.7666667 13.1 504600 130600 US62 NM33-04 P PPL GM 13 N ZSCHOPENTHAL Zschopenthal Zschopenthal 1994-01-08 diff --git a/reference/help.txt b/reference/help.txt index 6d0c9e3b8..738ca085d 100644 --- a/reference/help.txt +++ b/reference/help.txt @@ -195,14 +195,6 @@ File Types (-i and -o options): nuke_placer (0/1) Omit Placer name geojson GeoJson compact (0/1) Compact Output. Default is off. - geonet GEOnet Names Server (GNS) - snlen Max synthesized shortname length - snwhite (0/1) Allow whitespace synth. shortnames - snupper (0/1) UPPERCASE synth. shortnames - snunique (0/1) Make synth. shortnames unique - urlbase Basename prepended to URL on output - prefer_shortnames (0/1) Use shortname instead of description - datum GPS datum (def. WGS 84) dg-100 GlobalSat DG-100/BT-335 Download erase (0/1) Erase device data after download erase_only (0/1) Only erase device data, do not download anything @@ -215,7 +207,6 @@ File Types (-i and -o options): dump-file Dump raw data to this file input-is-dump-file (0/1) Dump raw data to this file timezone Time zone ID - googledir Google Directions XML kml Google Earth (Keyhole) Markup Language deficon Default icon name lines (0/1) Export linestrings for tracks and routes diff --git a/style/geonet.style b/style/geonet.style deleted file mode 100644 index 7b7d3a15c..000000000 --- a/style/geonet.style +++ /dev/null @@ -1,49 +0,0 @@ -# gpsbabel XCSV style file -# -# Format: GEOnet Names Server (GNS) (http://earth-info.nga.mil/gns/html/cntry_files.html) -# Author: Olaf Klein -# Date: 08/20/2002 -# - -DESCRIPTION GEOnet Names Server (GNS) -EXTENSION txt - -# -# FILE LAYOUT DEFINITIIONS: -# - -FIELD_DELIMITER TAB -RECORD_DELIMITER CRNEWLINE -BADCHARS TAB -ENCODING UTF-8 - -PROLOGUE RC UFI UNI LAT LONG DMS_LAT DMS_LONG UTM JOG FC DSG PC CC1 ADM1 ADM2 DIM CC2 NT LC SHORT_FORM GENERIC SORT_NAME FULL_NAME FULL_NAME_ND MODIFY_DATE - -# -# INDIVIDUAL DATA FIELDS, IN ORDER OF APPEARANCE: -# -IFIELD IGNORE, "", "%s" # RC ( http://earth-info.nga.mil/gns/html/gis_contryfiles.html ) -IFIELD IGNORE, "", "%s" # UFI -IFIELD IGNORE, "", "%s" # UNI -IFIELD LAT_DECIMAL, "", "%03.7f" # LAT -IFIELD LON_DECIMAL, "", "%03.7f" # LONG -IFIELD IGNORE, "", "%s" # DMS_LAT -IFIELD IGNORE, "", "%s" # DMS_LONG -IFIELD IGNORE, "", "%s" # UTM -IFIELD IGNORE, "", "%s" # JOG -IFIELD IGNORE, "", "%s" # FC -IFIELD IGNORE, "", "%s" # DSG -IFIELD IGNORE, "", "%s" # PC -IFIELD IGNORE, "", "%s" # CC1 -IFIELD IGNORE, "", "%s" # ADM1 -IFIELD IGNORE, "", "%s" # ADM2 -IFIELD IGNORE, "", "%s" # DIM -IFIELD IGNORE, "", "%s" # CC2 -IFIELD IGNORE, "", "%s" # NT -IFIELD IGNORE, "", "%s" # LC -IFIELD IGNORE, "", "%s" # SHORT_FORM -IFIELD IGNORE, "", "%s" # GENERIC -IFIELD SHORTNAME, "", "%s" # SHORT_NAME -IFIELD DESCRIPTION, "", "%s" # FULL_NAME -IFIELD IGNORE, "", "%s" # FULL_NAME_ND -IFIELD IGNORE, "", "%s" # MOD_DATE diff --git a/testo.d/googledir.test b/testo.d/googledir.test deleted file mode 100644 index a506adde5..000000000 --- a/testo.d/googledir.test +++ /dev/null @@ -1,6 +0,0 @@ -# -# Quick tests for Google Direction XML format -# Note: Reference files are from GPSBabel's own output. -# -gpsbabel -i googledir -f ${REFERENCE}/google-direction.xml -o gpx -F ${TMPDIR}/google-direction.gpx -compare ${REFERENCE}/google-direction.gpx ${TMPDIR}/google-direction.gpx diff --git a/vecs.cc b/vecs.cc index 00ecb372e..9a1eeaca1 100644 --- a/vecs.cc +++ b/vecs.cc @@ -104,7 +104,6 @@ extern ff_vecs_t wbt_svecs; extern ff_vecs_t wbt_fvecs; //extern ff_vecs_t wbt_fvecs; extern ff_vecs_t vcf_vecs; -extern ff_vecs_t google_dir_vecs; extern ff_vecs_t tomtom_vecs; extern ff_vecs_t bcr_vecs; extern ff_vecs_t ignr_vecs; @@ -187,7 +186,6 @@ struct Vecs::Impl LegacyFormat wbt_ffmt {wbt_fvecs}; //LegacyFormat wbt_ffmt {wbt_fvecs}; LegacyFormat vcf_fmt {vcf_vecs}; - LegacyFormat google_dir_fmt {google_dir_vecs}; LegacyFormat tomtom_fmt {tomtom_vecs}; TefXMLFormat tef_xml_fmt; LegacyFormat bcr_fmt {bcr_vecs}; @@ -488,13 +486,6 @@ struct Vecs::Impl "vcf", nullptr, }, - { - &google_dir_fmt, - "googledir", - "Google Directions XML", - "xml", - nullptr, - }, { &tomtom_fmt, "tomtom", diff --git a/xmldoc/formats/geonet.xml b/xmldoc/formats/geonet.xml deleted file mode 100644 index 8b1378917..000000000 --- a/xmldoc/formats/geonet.xml +++ /dev/null @@ -1 +0,0 @@ - diff --git a/xmldoc/formats/googledir.xml b/xmldoc/formats/googledir.xml deleted file mode 100644 index 5b7c170ae..000000000 --- a/xmldoc/formats/googledir.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - This format is designed to read the XML emitted when you -use the - Google Directions API. - - -If you use a Unix-compatible -operating system, this shell script might be useful: - -/dev/null >google_map.xml -gpsbabel -i googledir -f google_map.xml -o gpx -F google_map.gpx -]]> - -- 2.30.2